From ebd1016e5acf9633efd77a9071672276e255d435 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Thu, 3 Jan 2019 11:13:19 +0100
Subject: [PATCH] Linker: Simplify return paths

* Avoid else after return.
* Use early-return pattern.

Change-Id: I059e233d019dbc2233756776dfa09f8f2fdb2df7
---
 includes/Linker.php | 82 ++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index 89a41dce84..d1434f8ff4 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -958,23 +958,23 @@ class Linker {
 
 		Hooks::run( 'UserToolLinksEdit', [ $userId, $userText, &$items ] );
 
-		if ( $items ) {
-			if ( $useParentheses ) {
-				return wfMessage( 'word-separator' )->escaped()
-					. '<span class="mw-usertoollinks">'
-					. wfMessage( 'parentheses' )->rawParams( $wgLang->pipeList( $items ) )->escaped()
-					. '</span>';
-			} else {
-				$tools = [];
-				foreach ( $items as $tool ) {
-					$tools[] = Html::rawElement( 'span', [], $tool );
-				}
-				return ' <span class="mw-usertoollinks mw-changeslist-links">' .
-					implode( ' ', $tools ) . '</span>';
-			}
-		} else {
+		if ( !$items ) {
 			return '';
 		}
+
+		if ( $useParentheses ) {
+			return wfMessage( 'word-separator' )->escaped()
+				. '<span class="mw-usertoollinks">'
+				. wfMessage( 'parentheses' )->rawParams( $wgLang->pipeList( $items ) )->escaped()
+				. '</span>';
+		}
+
+		$tools = [];
+		foreach ( $items as $tool ) {
+			$tools[] = Html::rawElement( 'span', [], $tool );
+		}
+		return ' <span class="mw-usertoollinks mw-changeslist-links">' .
+			implode( ' ', $tools ) . '</span>';
 	}
 
 	/**
@@ -1463,16 +1463,15 @@ class Linker {
 		// compatibility, acc. to brion -ævar
 		if ( $comment == '' || $comment == '*' ) {
 			return '';
+		}
+		$formatted = self::formatComment( $comment, $title, $local, $wikiId );
+		if ( $useParentheses ) {
+			$formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
+			$classNames = 'comment';
 		} else {
-			$formatted = self::formatComment( $comment, $title, $local, $wikiId );
-			if ( $useParentheses ) {
-				$formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
-				$classNames = 'comment';
-			} else {
-				$classNames = 'comment comment--without-parentheses';
-			}
-			return " <span class=\"$classNames\">$formatted</span>";
+			$classNames = 'comment comment--without-parentheses';
 		}
+		return " <span class=\"$classNames\">$formatted</span>";
 	}
 
 	/**
@@ -2089,27 +2088,26 @@ class Linker {
 
 		if ( !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) {
 			return self::revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
+		}
+		if ( $rev->getId() ) {
+			// RevDelete links using revision ID are stable across
+			// page deletion and undeletion; use when possible.
+			$query = [
+				'type' => 'revision',
+				'target' => $title->getPrefixedDBkey(),
+				'ids' => $rev->getId()
+			];
 		} else {
-			if ( $rev->getId() ) {
-				// RevDelete links using revision ID are stable across
-				// page deletion and undeletion; use when possible.
-				$query = [
-					'type' => 'revision',
-					'target' => $title->getPrefixedDBkey(),
-					'ids' => $rev->getId()
-				];
-			} else {
-				// Older deleted entries didn't save a revision ID.
-				// We have to refer to these by timestamp, ick!
-				$query = [
-					'type' => 'archive',
-					'target' => $title->getPrefixedDBkey(),
-					'ids' => $rev->getTimestamp()
-				];
-			}
-			return self::revDeleteLink( $query,
-				$rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
+			// Older deleted entries didn't save a revision ID.
+			// We have to refer to these by timestamp, ick!
+			$query = [
+				'type' => 'archive',
+				'target' => $title->getPrefixedDBkey(),
+				'ids' => $rev->getTimestamp()
+			];
 		}
+		return self::revDeleteLink( $query,
+			$rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
 	}
 
 	/**
-- 
2.20.1